Fix infinite loop in DNS parsing #38
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Reduces MAC address parsing into a single line with nom. Should we verify the size of the input/number of items joined?
Adding the `verify` combinator prevents us from getting stuck in a loop, since there is no `else` condition. This has been seen in the wild.
dgmcdona
force-pushed
the
dgmcdona/dns_infinite_loop_fix
branch
from
c75e1b0 to
12d5d19
Compare
|
thanks for the fix! |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The primary goal of this PR is to fix an infinite loop that was seen in the wild when parsing DNS entries from a sample with private data logging enabled. This is due to a lack of verification of the IP type (4 vs 6) with no corresponding
elseblock in the subsequent parsing loop. I also took the opportunity to do some minor cleanup, reducing some of the parsing down to one-liners with nom.